Fix race condition in DirectRunner executor shutdown - #39096
Conversation
Previously, in ExecutorServiceParallelExecutor, if an exception occurred during registry cleanup (such as a timeout inside DoFn teardown), the pipeline state was transitioned to terminal before the exception was queued in `visibleUpdates`. This introduced a race condition where `waitUntilFinish()` could detect the terminal state and exit successfully before the exception was offered to the updates queue, swallowing the exception. This caused tests like `CallTest.givenTeardownTimeout_throwsError` to fail since they expected the pipeline to throw an exception. This change swaps the order so that the exception is posted to `visibleUpdates` before updating the pipeline state to terminal, ensuring the exception is always propagated.
|
Run Java_IOs_Direct PreCommit |
|
Running |
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses a race condition in the DirectRunner's executor shutdown logic. By ensuring that exceptions are properly queued before the pipeline state transitions to a terminal status, it guarantees that errors are correctly propagated to callers of waitUntilFinish, resolving intermittent test failures related to teardown timeouts. Highlights
New Features🧠 You can now enable Memory (public preview) to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request modifies the shutdown logic in ExecutorServiceParallelExecutor.java by deferring the pipeline state transition until after error aggregation and reporting. However, this introduces a critical issue: if an exception occurs during error formatting (such as a NullPointerException if an error message is null), the pipeline state transition will be bypassed, leading to an indefinite hang. To resolve this, the state transition should be executed within a finally block to guarantee it always runs.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
|
Run Java_IOs_Direct PreCommit |
|
Re-running the failed |
|
r: @Amar3tto |
|
Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment |
[release-2.75] Cherry-pick #39096 to the branch
3 participants
Previously, in ExecutorServiceParallelExecutor, if an exception occurred during registry cleanup (such as a timeout inside DoFn teardown), the pipeline state was transitioned to terminal before the exception was queued in
visibleUpdates.This introduced a race condition where
waitUntilFinish()could detect the terminal state and exit successfully before the exception was offered to the updates queue, swallowing the exception.This caused tests like
CallTest.givenTeardownTimeout_throwsErrorto fail since they expected the pipeline to throw an exception. This change swaps the order so that the exception is posted tovisibleUpdatesbefore updating the pipeline state to terminal, ensuring the exception is always propagated.fixes #38845